comments; more elegant code