cleaning the code :)