additional clean up, added location class