Some style and cleanup