Fixed alignment and comma