Cleaning up share calculation