Some commenting/general cleanup