Minor changes after reading style guide