Minor fixes, docs and comments updated, removed unnecessary clutter