cleanup & sources review