Linting

Let's hold merging this, until we release 414. 

Meanwhile you can r?