Fixed lint warnings, mostly bad practices!