fixed indentation, made location a component