Update of formatting, minor fixes