Updated code layout for consistency. #229