Perform some improvements