cleaned up comments, removed some methods