Working on cleaning up FPGA code