Some linting, norifing and stuff