Minor athstetic fixes to code