Removed magic numbers, refactor code, added in bidding stubs