Code style changes and cleanup