cleaned up some naieve code