removed unwanted changes and fixed formatting and other minor fixes