Firmware Cleanup

Made what's what