reverting some minor formatting and local changes