No need to tap the Class after creating it

We can do better =) :heart: 

review @dylanahsmith or @camilo