Updated method signatures

Updated method signatures with proper spacing and changed id to
instancetype.