Some misc formatting and cleanup