reformatted code
finished refactoring code
fixed merge conflict