Minor readability changes to implementation file