Cleanup for code readability and uniformly-styled progress messages