Clean up and style