pretty method fixes for better display, minor hash cleanup