Improved formatting, suppressed warnings for unused functions.