Minor code refactoring
Merge pull request #563 from 28msec/aws

Minor code refactoring