21 OCT Clean code 2