minor changes and beautification