Code cleanup: Spacing in site code
Loc freeze for sprint Black-7