Some refactoring

Removed few comments and changed some names