cleanup and aesthetic changes