patch cleanup & commenting