Clean up style and a bugfix