License and code clean ups.