Refactoring - be more expressive.

And add some FIXME annotations for later.

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>