Cleanup, refact