Improve whitespace and readability
Use instancetype in the initializers instead of id for increased compiler assistance