Misc formatting/cleanup