Main object rename
Minor refactoring
FindBlocks method
Validate method