work on code style