Clearning up code
Cleaning even more