code refactoring
code problems solved