Added aligning var/type annotations