Efficiency & format refactor