Small improvements and formatting for readability