refining following boilerplates
refining following boilerplates