Added linting
A bit of cleanup