Modify and cleanup courses section