cleaned up classes and packages