Closes #7 Code cleanup