feature/491: fixing problems reported by reviewer.