some beautification and small changes