Remove some business logic from views