A bit of refactoring and prefer NORTH/SOUTH over EAST/WEST