alignment fixes
Style fixes