Review/improve
More improves
Merge pull request #1 from ebidtech/review-1

Review/improve