updated and made it more pretty by formatting some strings