Wrap some long lines
Fix indentation
Fixed indentation
Fix indentation and comment placement