Implemented review comments