change formatting based on suggestions
Merge pull request #730 from tarebyte/formatting-changes-from-pullreview

Change formatting based on suggestions