Lintfixing and cleaning code