More Clean Up + Closes #11 & Closes #12