Fixing a bug when rendering a shape that has a piece cut out of the middle of it. Plus a bit of code cleanup (adding new lines and braces and removing an unused method)