Update validate to match copy module

Plus other white space fixin'