code cleaning up, add comments