Improve formatting for standalone distribution