cleaned up code and added more packages