Adding comments and removing redundent things