Some quick cleanup and simplifications

Cleaning up a few frontend bits.