Prepare for a little nicer code formatting