Fix formatting based on checkstyle