remove extra imports, make the lists into properties
t	Merge branch 'master' of github.com:ajwerner/safe