Fixed indentation and made everything use only Vector2D and Rectangle2D.Double