Modernize

Move ivars to class extension; prefix ivars with underscore