Cleaning code. Better comments.