Fixed formating issues with output