Correct a location, simplify code a bit