Changed most of the SELF usages to underscore-ivars throughout in order to better handle memory usage