Fixing lint warnings. Mainly changing visibility of variables/methods.