Now that most angular things are figured out, clean up a bit