Final commenting/clean up