last commit, code clean up