Initial small changes before moving Java code from laptop to PC