Changed a lot of things, to match with the new checkstyle