Clean up style, fix error