Started refactoring of ugly methods.
Added some TODOs
Removed some TODOs
Merge branch 'PROZ-project' into RC
Removed some comments
Removed some comments