removed some pointless stuff and added some (pointless) comments