Some lil refactoring to save some memory for the 328p