removed all references to java including converting collections to scala types