miscell cleanup and prettyfication in collector and application