cleanup & commenting