removed unnecessary SourceHandler
refactor