cleanup
change method params