Change some copy and general refactor
Fix spacing and style issues