Minor refactoring
Fixes #14: Marks are no longer persistent