Tidy

Move data to separate file, small log message tidy.