Few adjustments as in https://github.com/theFirehoseProject/technical-interview/issues/10