Cleaning Code #1

Cleaning some of the code, still WIP