Style: breaking up long lines and fix indentions