update to shorter/cleaner/readable syntax