Re-cleaning python formatting after SD merge. (PECAS-84)
Re-clean Java code. (PECAS-81)
Further clean-up of Java formatting. (PECAS-81)