Comments n cleanup