Mind if i clean up a bit