Some quick code clean up