@trivial look & feel cleanup