Implemented review comments to use clientRb and runlist template and code cleanup