Made fixes based on CR feedback