Update and Cleaning

Re-organize some of my codes