refactors ns forms, uses :require instead of :use