Cleanup + A little bit of commenting