Minor changes to code style