Removing SuppressWarnings and fixing some finals