Code cleaning, commenting