Code cleanup + Comments