Some re-format and cleanup