Cleans up 3f8cd7f4ebdcfd310225ace6eca7bad3fff6f2ab (Tratcher's refectorings)