Cosmetic changes and slight refactoring
Slight changes