Nitpicking and move to a lib to test easier later.