cleaning up. rename. add comments
cleaning up