Finalize formatting #14