Coding style (moved short inline methods into the class declaration)
Started with Dictionary container class