Refactoring of Receipt activity (related to issue #59)