Removing unnecessary style changes and some style cleanup