[HOUSEKEEPING]

Cleans the code and fixes little details