Cleared up uncommented code