cleaning the code like crazy XD