Misc formatting/comments