Re-design as per PR feedback