cleaned up some things in index and goal controller