Updated universe files to adhere to most checkstyle rules