Minor fixes, refactoring and TODO notes added