Code Cleaning

align codes