Code style and cleanup