Refactoring/Cleanup/Comments

Following previous code review.
More changes will be followed in a future pull request.