[REFACTOR] General code cleaning