Code commenting, cleaning basically done