Did code beautification