clean code as advised.