Small refactoring. More list comprehention goodness.
Licencing tweeks.