Added hashcode()
Removed old test code
Renamed some fields to comply with naming conventions
Renamed some vars to comply with naming conventions