Added coords option to getPoints() + cleanup