some formatting reverted, java 6 support

Signed-off-by: Ketoth Xupack <ketoth.xupack@gmail.com>