General cleaning	and formatting