Refactored - consolidated dictionaries, updated method names, cleaned up private methods.