minor formatting and @SuppressWarnings, only