cleaning the code -- with code now :)