complete refactoring finished
adds notes