Aesthetic changes, logging and comments