changed files to accomodate implicit 'this'
changed booleans to match object style