Code cleanup. Next up is interpreting messages