Cleaned up to_s/to_i