DEV: Beginning of code cleaning