added space after state prefixes,
refactoring - renaming