Still cleaning the code