Did more prettification