Improve comment
Remove @SuppressWarning