Add efficiency cleanup, close up API a bit