fixed some formatting
migrated to my (smaller) java base)