Latest commit, cleaned codes