Merged two steps & used beautified code blocks