code clean up for kamil