Cleaned up camera/controller funk a bit