Fix checkstyle violations

This is to fix checkstyle violations we have at the moment.