Refactoring of comments
Added a bit more documentation