Removed minor code issues
Some more code style issues fixed
Use SimpleGrantedAuthority instead of deprecated GrantedAuthorityImpl