Fixed formating issues