How do I write this address correctly?

Here's the address:

X-X-X-X
TAKASU MIHAMA-KU CHIBA-CITY CHIBA
261-0004 JAPAN


I didn't put the name because of privacy, but is this the way it should be written???

PERSONS NAME
X-X-X-X TAKASU
MIHAMA-KU, CHIBA-CITY, CHIBA
261-0004 JAPAN

Is OK, Alternately, JAPAN can go on a line by it self.

-------
In real practice, I found that as long as your Postal Code is correct and street/house etc number is correct, the post office figures the rest out even if you mistakenly put it in the wrong order, as the Postal code itself already contains almost 99% of the information the post office needs.