Code style review and cleanup