Me and 'this', some additional cleanup
Maintenance spelling