Converted methods to use self as the variable instead of the type name