code cleanup and revised info output for boot and recovery images