Refactored to match solid standards
Removed uneeded logs and cleaned up the progress process.