Comments and small refactoring

Making code ready for other eyes than mine....