CLEAN CODE UPDATE