fixed style issues
comment typo
route entry is now removed upon entry in Service state (as it was previously)