All fixed up, remove comments