Fixed alignment issues for block of vars