Cleanup and style