Updates again, removing un-needed internal functions, adding comments