Last time i did refactor but not optimizations, so more work should be done. Maybe after all queries are written, mb not