Style changes and simpler code.