Small refactoring, add README