Style bug fixes + rewording