code clean up, commented..