Cleared up the code, mixed 'nil user' error, and made controller methods more obvious