More elegant code!