cleaned up extra code