Some linting, fixed some stuff.