Re-Refactor code under new specs. FlashAvr.