Fix minor code style issues