cleaned up comments and took out unnecessary packages