Fix all pyflakes warnings
Less Java, more Python