Resolved formating issues