Cosmetic changes;
Slight refactored, some comments added;