Cleans up class namespace