some code formatting, rewrite assertions from  to self