Fix indent convention & reduce line length