Minor re-factore, add MD5 string generation utility