Small cleanup of the code. Using needs instead of populating controller relationships manually.