Comment and general cleanup