Removed business-specific code.
Minor refactoring.