Code aesthetics update