just some minor pimping...