Clean comments and realign calculations