reformating and fixes