Some quick cleanup and simplifications