Cleaned up some stuff for myself