typehint and fix cs