A bit more refactoring, removed 'keywords'