CLean up and commenting