Add comments and spaces