Just cleaned the code and completed test