Removed comments on top of files. Some small refactoring actions also.
Merge remote-tracking branch 'origin/master'