Code cleanup, successful test with dev-file (not actual uart).