- added code beautification