refactoring
*much* better.