Improve hashCode method