Resolve "Remove commented code"

Removed commented code, at some points TODO were added to mark parts which may need further discussions.

Closes #20 (closed)