WIP: v1.1(20%): Cosmetic changes and comments