DRY & Some Syntax rewrite