minor changes for clarity
experimental coffeescript version