General cleaning up and commenting