cleaned up my shit