Formatting and minor things