Cleanup and pylinting