Remove unnecessary this.*
Change declaration access to weakest