support Void clauses, refactoring and comply to linter