fixing lints and hints