cleaning the code ~