cleanup attributes alignment
cleanup alignment