Additional formatting fixes (adding spaces, deleting extra lines, etc.)