Followed aengelke's suggestions.