Draws circles and squares on locations and refactoring