todos: Some refactoring
Merge pull request #89 from bem/improvements

Improvements