I've had great luck with Flitz polish followed by Renaissance Wax.