move type annotations back