Aesthetic modifications

Pertains to Issues #23 and #24