cleaning up some code for my sanity