Extras: Some quick optimizing and cleanup