Basic commenting working and simplified