fix alignment and formating issues