Small formatting and reame changes