Alignment fixes
Style and naming improvements