Worked on code style