Some renaming
Prettify
Fixed unit tests and comments