Merge "Style and asset cleanup"