Fix code style and some cleanup.