Refactoring and Cleaning the Utopian API [Part 2]