Cleaned up controller & deleted extra view