Fixed indentation
Made more readable
Force use of annotated type declaration