More commenting/clean up