Cleaned some stuff... Still ongoing