Cleaned up pricing code, created separate passage to shift prices that can be
called when required.