Refactor against duplicate code + minor changes