Final Code-Review touches have been made.

Hope we will get good points :P