master
Clean and comment code