Polishing display code..