Add Location enum and fix style conventions