cleanup - make it understandable