Style changes and improved code style