Updates to pass checkstyle