minor changes - removed needless function