Follow java convention

As per #33 untabified and removed test message strings from Java code