Fix for clarity and style

based on @fatbusinessman comments in pull request