remove lint warnings + general improvements