cleaned up java code
Merge remote-tracking branch 'origin/master'
clean java code
jesus FUCK