Commented and cleaned up LocationActivity