Improve eclipse code formatting, make checkstyle a lot more happy