Clean up to_s5 a bit