Cleanup & commenting