TODO Added
Copyright to source files added
TODO added. Code refactoring