Vera pinup - Cleaning the class