Clean up ns declarations, more idiomatic code

This cleans up the namespaces, converting :uses to :requires, removing unused declarations, and making code more idiomatic.