some beautification
I am onto something