Minor code refactoring - Guava-style initialization added.