Some minor clean ups

Fixed the listOfProfiles to have 1 less where clause, shortened out some
other code for fun :D