Align memory
Code clean