Cleaned up controller code, added basic user spec