Modifications to code style