General clean up and commenting