Refactored

1. removed method parameters for instance vars
2. alphabbetized method names
3. removed some superfulous code
4. moved all class constants to top of file