[#5] Improve look and feel

Not needed code removed.