Code Clean + Comments + Changes