cleaning up and organizing

also, moved from ipy notebook to just a py file