Style changes and code cleanup