total code refactoring
comprehension