minor cleanup & commenting