Refactoring, removed dot prefixes