working on code refactoring
working on code cleaning