apply stylisitic suggestions from @ali-graham