Standardized code layout slightly