-cleaned up extra code