Merge "fix sharpness bug and clean up"