Cleanup/lint code