fixing all the garbage that was commited last time