Code cleanup and beginning data restructuring for hardware and user
parameters.