Formatting/warning cleanup