Formatting mainly... some prettyifiying