Style changes and cleanup