Tweaks to indentation
Remove unneeded infrastructure