remove stupid funcs and fix formatting