More cleanup. Been bugging me for a while