Removed a few 90 degree corners, cleaned up a few traces.