Code style improvements and code simplifications.