Small refactoring
refs #11 Wipe all logic