Improve typgoraphy