Few fixes - Error on incorrectly formatted bill amount. Code refactor.