Minor code simplification.
Merge pull request #115 from phalphalak/minor-code-cleanup

Minor code simplification