Refined code

More comments