Clean up + Closes #5, #6, #9