Small formatting and aesthetic changes