Updated the code a little to resolve hound comments