Form params type checking
Style improvement