Trying to fix some errors + cleaning