Updated readme screenshot & small refactoring