cleaned up code
Merge pull request #144 from red-admirals-2014/cleaner_userindex_code

cleaned up code