Clean up from bad copy/paste

Add more comments