cleaned up comments, removed extra functions