refactor; include Redlander module