Removed unneeded references to self, and redundant initalize method