cleanup & maybe speedup