Replaced use of _ with self. outside of init/getters/setters
Replaced _ with self outside of init methods, fixed minor find/replace error