Added firmware data, clean up and variable refactoring